Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 31 Jan 2012 03:59:34 +0000 (19:59 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 31 Jan 2012 03:59:34 +0000 (19:59 -0800)
commite191e1a0d35dd0a2fd5078107134e00d412ef92d
treeae74275dc6a84eaa3a760b801a029dc991549a38
parent7d5ab4c649c6469adbd54e6b82ca1b3b26089a60
parenta041506068507890a45ed7ae19b8c49791aaab61
Merge from trunk.